Auto merge of #1792 - steveklabnik:gh26482, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 8 Jul 2015 17:35:42 +0000 (17:35 +0000)
committerbors <bors@rust-lang.org>
Wed, 8 Jul 2015 17:35:42 +0000 (17:35 +0000)
commit15b497b10c8261f09f15130595f696fcf29c3619
tree1bb59022da8020838202ab1c6649dbf6b85aaf75
parent5f4c188401c81b90826e4de32d5076149c139ca6
parentbc3ccf3b072479ed0859886a5c522d47253ed42e
Auto merge of #1792 - steveklabnik:gh26482, r=alexcrichton

In addition, clean up these docs a little.

Addresses part of rust-lang/rust#26482